libplacebo: 4.208.0 -> 5.264.1 #224795

Kranzes · 2023-04-05T09:02:41Z

Diff: https://code.videolan.org/videolan/libplacebo/-/compare/v4.208.0...v5.264.1

Changelog: https://code.videolan.org/videolan/libplacebo/-/tags/v5.264.1

Description of changes

Things done

Kranzes · 2023-04-05T12:22:41Z

I need to package libdovi but it seems to be using cargo-c which I don't know how to use properly as it isn't common in nixpkgs, I asked for help in the Rust Nix Matrix room, in the meantime I drafted this PR.

PedroHLC · 2023-04-05T13:00:50Z

Worth mentioning:

major breaking change of this
release is a switch away from the external libepoxy and mako
dependencies in favor of the (optionally bundled) glad2 and jinja2.

Since it explains the glad2 new dep. And that we can remove the libepoxy dep.

Kranzes · 2023-04-05T14:22:53Z

I already got those two sorted.

Kranzes · 2023-04-05T16:01:57Z

@PedroHLC I can't get it to detect glad2 and jinja2 properly, can you help out?

PedroHLC · 2023-04-05T17:50:05Z

@PedroHLC I can't get it to detect glad2 and jinja2 properly, can you help out?

Their meson.build is overwriting our PYTHONPATH:

{
  postPatch = ''
    substituteInPlace meson.build \
      --replace 'python_env.append' '#'
  '';
}

PS: vulkan-headers is a nativeBuildInputs (python3Packages.* too), and in src the preferred way is hash = "sha256-..." instead of sha256 = "sha256-...".

Diff: https://code.videolan.org/videolan/libplacebo/-/compare/v4.208.0...v5.264.1 Changelog: https://code.videolan.org/videolan/libplacebo/-/tags/v5.264.1

Kranzes · 2023-04-05T19:19:53Z

Result of nixpkgs-review pr 224795 run on x86_64-linux 1

46 packages failed to build:

arcanPackages.all-wrapped
arcanPackages.arcan
arcanPackages.arcan-wrapped
arcanPackages.cat9-wrapped
arcanPackages.durden-wrapped
arcanPackages.pipeworld-wrapped
arcanPackages.prio-wrapped
arcanPackages.xarcan
deepin.deepin-music
deepin.deepin-voice-note
eaglemode
kaffeine
kphotoalbum
libsForQt5.elisa
libsForQt5.elisa.dev
libsForQt5.phonon-backend-vlc
libvlc
megaglest
minitube
obs-studio
obs-studio-plugins.advanced-scene-switcher
obs-studio-plugins.droidcam-obs
obs-studio-plugins.input-overlay
obs-studio-plugins.looking-glass-obs
obs-studio-plugins.obs-gstreamer
obs-studio-plugins.obs-hyperion
obs-studio-plugins.obs-livesplit-one
obs-studio-plugins.obs-move-transition
obs-studio-plugins.obs-multi-rtmp
obs-studio-plugins.obs-ndi
obs-studio-plugins.obs-nvfbc
obs-studio-plugins.obs-pipewire-audio-capture
obs-studio-plugins.obs-source-record
obs-studio-plugins.obs-vaapi
obs-studio-plugins.obs-vkcapture
obs-studio-plugins.wlrobs
pympress
pympress.dist
python310Packages.python-vlc
python310Packages.python-vlc.dist
python311Packages.python-vlc
python311Packages.python-vlc.dist
reaper
strawberry
vlc
wtwitch

56 packages built:

adl
ani-cli
anime-downloader
anime-downloader.dist
anki
anki.doc
anki.man
ankisyncd
celluloid
cplay-ng
cplay-ng.dist
curseradio
curseradio.dist
deepin.deepin-movie-reborn
deepin.deepin-movie-reborn.dev
dmlive
ff2mpv
gonic
haruna
hydrus
hydrus.doc
hypnotix
jellyfin-media-player
jellyfin-mpv-shim
jellyfin-mpv-shim.dist
jftui
libdovi
libplacebo
libsForQt5.plasmatube
mnemosyne
mnemosyne.dist
mpc-qt
mpv
mpv-unwrapped
mpv-unwrapped.dev
mpv-unwrapped.man
mpvScripts.inhibit-gnome
mpvScripts.mpris
mpvpaper
plex-media-player
plex-mpv-shim
plex-mpv-shim.dist
python310Packages.glad2
python310Packages.glad2.dist
python310Packages.mpv
python310Packages.mpv.dist
python311Packages.mpv
python311Packages.mpv.dist
qimgv
radioboat
somafm-cli
stremio
sublime-music
sublime-music.dist
subtitleedit
ytfzf

Kranzes · 2023-04-05T21:50:14Z

libvlc failing.

PedroHLC · 2023-04-06T20:23:07Z

libvlc failing.

Needs to bump, or backport this: https://code.videolan.org/videolan/vlc/-/merge_requests/3027

Kranzes · 2023-04-06T21:02:44Z

Result of nixpkgs-review pr 224795 run on x86_64-linux 1

1 package failed to build:

obs-studio-plugins.obs-ndi

101 packages built:

adl
ani-cli
anime-downloader
anime-downloader.dist
anki
anki.doc
anki.man
ankisyncd
arcanPackages.all-wrapped
arcanPackages.arcan
arcanPackages.arcan-wrapped
arcanPackages.cat9-wrapped
arcanPackages.durden-wrapped
arcanPackages.pipeworld-wrapped
arcanPackages.prio-wrapped
arcanPackages.xarcan
celluloid
cplay-ng
cplay-ng.dist
curseradio
curseradio.dist
deepin.deepin-movie-reborn
deepin.deepin-movie-reborn.dev
deepin.deepin-music
deepin.deepin-voice-note
dmlive
eaglemode
ff2mpv
gonic
haruna
hydrus
hydrus.doc
hypnotix
jellyfin-media-player
jellyfin-mpv-shim
jellyfin-mpv-shim.dist
jftui
kaffeine
kphotoalbum
libdovi
libplacebo
libsForQt5.elisa
libsForQt5.elisa.dev
libsForQt5.phonon-backend-vlc
libsForQt5.plasmatube
libvlc
megaglest
minitube
mnemosyne
mnemosyne.dist
mpc-qt
mpv
mpv-unwrapped
mpv-unwrapped.dev
mpv-unwrapped.man
mpvScripts.inhibit-gnome
mpvScripts.mpris
mpvpaper
obs-studio
obs-studio-plugins.advanced-scene-switcher
obs-studio-plugins.droidcam-obs
obs-studio-plugins.input-overlay
obs-studio-plugins.looking-glass-obs
obs-studio-plugins.obs-gstreamer
obs-studio-plugins.obs-hyperion
obs-studio-plugins.obs-livesplit-one
obs-studio-plugins.obs-move-transition
obs-studio-plugins.obs-multi-rtmp
obs-studio-plugins.obs-nvfbc
obs-studio-plugins.obs-pipewire-audio-capture
obs-studio-plugins.obs-source-record
obs-studio-plugins.obs-vaapi
obs-studio-plugins.obs-vkcapture
obs-studio-plugins.wlrobs
plex-media-player
plex-mpv-shim
plex-mpv-shim.dist
pympress
pympress.dist
python310Packages.glad2
python310Packages.glad2.dist
python310Packages.mpv
python310Packages.mpv.dist
python310Packages.python-vlc
python310Packages.python-vlc.dist
python311Packages.mpv
python311Packages.mpv.dist
python311Packages.python-vlc
python311Packages.python-vlc.dist
qimgv
radioboat
reaper
somafm-cli
strawberry
stremio
sublime-music
sublime-music.dist
subtitleedit
vlc
wtwitch
ytfzf

obs-studio-plugins.obs-ndi is unrelated.

PedroHLC · 2023-04-07T14:08:45Z

pkgs/applications/video/vlc/default.nix

+    # patch to build with recent libplacebo
+    (fetchpatch {
+      url = "https://code.videolan.org/videolan/vlc/-/merge_requests/3027.patch";
+      hash = "sha256-aV+YT1l0ND/USoIIpxcPhdIlP/06J2FxVW4uArS8j88=";


error: hash mismatch in fixed-output derivation '/nix/store/3b1xm0v22yizbr8nkd2p2hnyqg956ngc-3027.patch.drv': specified: sha256-aV+YT1l0ND/USoIIpxcPhdIlP/06J2FxVW4uArS8j88= got: sha256-Zz+g75V6X9OZI3sn614K9Uenxl3WtRHKSdLkWP3b17w= error: 1 dependencies of derivation '/nix/store/mp38cfqhwj1m02a118vhrmh5z5hkfkgk-libvlc-3.0.18.drv' failed to build

Did GitLab change the hash for a merged MR, or did we miscalculate the hash somewhere down the fetchpatch hill?

Already fixed in another pr.

dotlambda · 2023-07-28T15:14:35Z

pkgs/development/python-modules/glad2/default.nix

@@ -0,0 +1,28 @@
+{ lib
+, python3


Not okay in pythonPackages. This would use Python 3.10 for python311Packages.glad2. Fixed in #244135

dotlambda · 2023-07-28T15:15:29Z

pkgs/development/python-modules/glad2/default.nix

+    jinja2
+  ];
+
+  pythonImportsCheck = [ "glad" ];


Also add nativeCheckInputs or set doCheck = false.

Kranzes mentioned this pull request Apr 5, 2023

vulkan-sdk: 1.3.239 -> 1.3.243 #224485

Merged

ofborg bot requested review from tadeokondrak and primeos April 5, 2023 09:53

ofborg bot added 10.rebuild-darwin: 1-10 10.rebuild-linux: 11-100 labels Apr 5, 2023

Kranzes marked this pull request as draft April 5, 2023 10:17

Kranzes added 2 commits April 5, 2023 18:29

python3Packages.glad2: init at 2.0.3

18cc1ed

libdovi: init at 3.1.2

dcf37ba

Kranzes force-pushed the plaecebo branch from 1acb793 to 03b4c9c Compare April 5, 2023 16:01

github-actions bot added the 6.topic: python label Apr 5, 2023

ofborg bot added the 8.has: package (new) This PR adds a new package label Apr 5, 2023

libplacebo: 4.208.0 -> 5.264.1

908d96f

Diff: https://code.videolan.org/videolan/libplacebo/-/compare/v4.208.0...v5.264.1 Changelog: https://code.videolan.org/videolan/libplacebo/-/tags/v5.264.1

Kranzes force-pushed the plaecebo branch from 03b4c9c to 908d96f Compare April 5, 2023 19:02

PedroHLC mentioned this pull request Apr 6, 2023

staging-next 2023-04-05 #224806

Merged

3 tasks

vlc: fix build with recent libplacebo

8e89284

Kranzes marked this pull request as ready for review April 6, 2023 21:04

Kranzes requested a review from PedroHLC April 6, 2023 21:05

ofborg bot requested a review from AndersonTorres April 6, 2023 21:14

lovesegfault merged commit ed04529 into NixOS:master Apr 6, 2023

Kranzes deleted the plaecebo branch April 6, 2023 21:42

PedroHLC reviewed Apr 7, 2023

View reviewed changes

dotlambda reviewed Jul 28, 2023

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

libplacebo: 4.208.0 -> 5.264.1 #224795

libplacebo: 4.208.0 -> 5.264.1 #224795

Kranzes commented Apr 5, 2023

Kranzes commented Apr 5, 2023

PedroHLC commented Apr 5, 2023

Kranzes commented Apr 5, 2023

Kranzes commented Apr 5, 2023

PedroHLC commented Apr 5, 2023 •

edited

Loading

Kranzes commented Apr 5, 2023

Kranzes commented Apr 5, 2023

PedroHLC commented Apr 6, 2023

Kranzes commented Apr 6, 2023 •

edited

Loading

PedroHLC Apr 7, 2023

Kranzes Apr 7, 2023

dotlambda Jul 28, 2023

dotlambda Jul 28, 2023

libplacebo: 4.208.0 -> 5.264.1 #224795

libplacebo: 4.208.0 -> 5.264.1 #224795

Conversation

Kranzes commented Apr 5, 2023

Description of changes

Things done

Kranzes commented Apr 5, 2023

PedroHLC commented Apr 5, 2023

Kranzes commented Apr 5, 2023

Kranzes commented Apr 5, 2023

PedroHLC commented Apr 5, 2023 • edited Loading

Kranzes commented Apr 5, 2023

Kranzes commented Apr 5, 2023

PedroHLC commented Apr 6, 2023

Kranzes commented Apr 6, 2023 • edited Loading

PedroHLC Apr 7, 2023

Choose a reason for hiding this comment

Kranzes Apr 7, 2023

Choose a reason for hiding this comment

dotlambda Jul 28, 2023

Choose a reason for hiding this comment

dotlambda Jul 28, 2023

Choose a reason for hiding this comment

PedroHLC commented Apr 5, 2023 •

edited

Loading

Kranzes commented Apr 6, 2023 •

edited

Loading